@@ -3,7 +3,7 @@ |
||
3 | 3 |
from django.conf.urls import url |
4 | 4 |
|
5 | 5 |
from api import (admin_views, aep_views, antigen_views, eqpt_views, field_views, mini_views, oauth_views, point_views, |
6 |
- screen_views, wx_views) |
|
6 |
+ screen_views, wx_views, family_member_views) |
|
7 | 7 |
|
8 | 8 |
|
9 | 9 |
urlpatterns = [ |
@@ -69,6 +69,11 @@ urlpatterns += [ |
||
69 | 69 |
url(r'^mp/get_point_info$', point_views.get_point_info, name='get_point_info'), |
70 | 70 |
url(r'^mp/get_point_fields$', point_views.get_point_fields, name='get_point_fields'), |
71 | 71 |
url(r'^mp/save_point_fields$', point_views.save_point_fields, name='save_point_fields'), |
72 |
+ |
|
73 |
+ url(r'^mp/family/member/bind$', family_member_views.mp_bind_family_member, name='mp_bind_family_member'), |
|
74 |
+ url(r'^mp/family/member/list$', family_member_views.mp_family_member_list, name='mp_family_member_list'), |
|
75 |
+ url(r'^mp/family/member/delete$', family_member_views.mp_delete_family_member, name='mp_delete_family_member'), |
|
76 |
+ |
|
72 | 77 |
url(r'^mp/bind_eqpt$', point_views.bind_eqpt, name='bind_eqpt'), |
73 | 78 |
|
74 | 79 |
url(r'^mp/upload/temperature$', point_views.mp_upload_temperature, name='mp_upload_temperature'), |
@@ -133,12 +133,19 @@ class FamilyMemberInfo(BaseModelMixin): |
||
133 | 133 |
|
134 | 134 |
@property |
135 | 135 |
def data(self): |
136 |
+ try: |
|
137 |
+ user = IsolationPointUserInfo.objects.get(user_id=self.user_id, member_id=self.member_id, status=True).userdata |
|
138 |
+ except IsolationPointUserInfo.DoesNotExist: |
|
139 |
+ user = {} |
|
140 |
+ |
|
136 | 141 |
return { |
137 | 142 |
'member_id': self.member_id, |
138 | 143 |
'user_id': self.user_id, |
139 | 144 |
'identity_card_number': self.identity_card_number, |
140 | 145 |
'identity_card_name': self.identity_card_name, |
141 | 146 |
'relation': self.relation, |
147 |
+ 'created_at': tc.local_string(utc_dt=self.created_at, format='%Y-%m-%d %H:%M'), |
|
148 |
+ 'point_info': user |
|
142 | 149 |
} |
143 | 150 |
|
144 | 151 |
class IsolationPointUserInfo(BaseModelMixin): |